Switch license to GPLv3 or later.

diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el
index 565392c2840bbe956c2a6e9ced6f41e7b630f7f0..2530a6cc5a38eb812bc87f506502abb3ed4c1ca2 100644 (file)
--- a/lisp/mail/blessmail.el
+++ b/lisp/mail/blessmail.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index c60d93b26b1103a114b42b3d0468153e6fbdaa4f..df5445da4124d811547e0ed8ec32fbbaf276ddc6 100644 (file)
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index 7992438df251450c909575adad490e2980254736..be47032a0c2127952bf1a7d263c7fcc93930cca3 100644 (file)
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful, but

diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 5029ca2334339fd771adbff039b04c4e7ca7e313..94a95cd54e5b280b5df9365451e7c15d051162fa 100644 (file)
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el
index 9efdc89268444128d0f9016763990dcca9cc03e4..7a1b7a64c542108729e31ea5c4b109bc4ea62c6c 100644 (file)
--- a/lisp/mail/mail-hist.el
+++ b/lisp/mail/mail-hist.el
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index 2f28116844045ceed39a4ad5c46c177cbb570e31..08d539b34917420b037c049e45db3f94e4a3e0c2 100644 (file)
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index b83b3864cb42152780161064d2a1fa8743690afa..b3e2c051e7d129dc80653a280edceb9e051c761a 100644 (file)
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index 62296ea0228e33ad523d4f48f86068e118a15b72..0b0982d164dc8db22441a8bc2c4df87654e6bcd6 100644 (file)
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index 0b7f595b5e67b851d96c0cceee7d65412709109b..5f2e021c68f2064dd3018b5a3007114f765c7274 100644 (file)
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/mailheader.el b/lisp/mail/mailheader.el
index 2eed90b6972c24e620dd9f1c496a51966ff47824..9b61a24c74f4f82c276c060e5c055aad8fb3c2d7 100644 (file)
--- a/lisp/mail/mailheader.el
+++ b/lisp/mail/mailheader.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index 22149d79026da60e4ee8d1ef410f087efa9da808..b5940cfbdd069e921017b80edff1b13cba22d02d 100644 (file)
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index d299b9af57c8221e51e07218607b1e44adeb5c8f..d14be55735f6b412811430915e80a11a49531e91 100644 (file)
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index cde9a25ec0bee484dd8cba3de4832f600cd0cfe6..5c6bcb83efd7e2d46be7241ee9cacc167d736806 100644 (file)
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/rfc2368.el b/lisp/mail/rfc2368.el
index 610c0466be5c909c2341dba22c1d9d82492f519c..16f1758a3fca2ff1011134297a145f568621380f 100644 (file)
--- a/lisp/mail/rfc2368.el
+++ b/lisp/mail/rfc2368.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el
index 5afe253b8313ad5c85aaf17696d44fdad4f720b3..09dd95e7e790c658dd1b126bb29475a9530425ab 100644 (file)
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index d0f4db6f4469b64966cfb465e54faaf0f749fa08..fa96ffaab8baa8537de4ae9850ad2b4cc8085afb 100644 (file)
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -8,7 +8,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 2a2f0355ab24082afed49da9c7f6a181e9866e2e..37a0533acc916b19f1f9e57658be5f4ebbd11eb0 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index a03edb9862978dc72f8c916a0346eb3b6b5f1c64..04982aec3491e62ce310b5adb83a83810b440b07 100644 (file)
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index 5e8779e255322173149dda8c495240597f1df780..c479e35beb7e486a7fbc196b6a50681ab0a20921 100644 (file)
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index dc50f95b921dd7a4dd7abb87d032cad239be44f6..3b7ccd72d02b841c1a2beed42098e17892c09a86 100644 (file)
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 459b51cf504e16f143c4152097c967e2e6143df0..d85bfc0bfe8ecaed540f59fdc26c8415680bb854 100644 (file)
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index ffa187fc83a9017cf798efab70dde21dc33222f2..ba496a31228c632c9b54787457c40d7257905c19 100644 (file)
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 288f3f24e6638203e57fce180d773430a1c7794f..85527e59f673dd121cd2e2501f7e668d90e07c37 100644 (file)
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index c0fcdf8ff432b409a89afede9fa9e46c4f643ad3..5803661bc6e23a4cc4c0e1063c5fa0aba2dd17ff 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 66c4bdd8df71587dec3d1056a7fdc45e252a2997..176a9cd32fa9d254854841c5ac393d9b67b79196 100644 (file)
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -16,7 +16,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index a752f4d29805e083d298a071c42ea0de362e6c0f..cf9c9369497fd269ad829ea526222ddadd30256b 100644 (file)
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -15,7 +15,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el
index b1d6fb046eb545efe59b5320b969f3912d5583dc..61afd248332aac7dc1dec90f2acb9708bc24e4d3 100644 (file)
--- a/lisp/mail/uce.el
+++ b/lisp/mail/uce.el
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index ab4fb8b81ef49e892d8439d92200cd69b3fcdd82..5b01f71117600ff422b44dbc5196fab257d296ec 100644 (file)
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index cd0b3444d2c35e25f321edda1835d95d85dc02a6..f1cf85a4ffca5d1cd7961ce579bf51c1b9413287 100644 (file)
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mail/vms-pmail.el b/lisp/mail/vms-pmail.el
index c5a149f1005b5621e142a44c41c06f5102bd308f..2d01e2a612b8220e0aa4a78d3364ff58ad52ba1b 100644 (file)
--- a/lisp/mail/vms-pmail.el
+++ b/lisp/mail/vms-pmail.el
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,